Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Nov 2011 01:37:41 +0000 (17:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Nov 2011 01:37:41 +0000 (17:37 -0800)
commit232d01a22ab5ef2d803a3cf9fd738e44b9e72508
treefb55e11efc86808672082bdf22435fdd1fea8960
parent2102b1f74b89cc94bacce580028cf154aa2f8c3b
parent5d637f173fc4ddb279f814a55865de8160545303
Merge from trunk.